Skip to content

Fix a issue when cancelling an enroll.#11067

Merged
ph merged 2 commits intoelastic:masterfrom
ph:fix/confirm-no-enroll
Mar 11, 2019
Merged

Fix a issue when cancelling an enroll.#11067
ph merged 2 commits intoelastic:masterfrom
ph:fix/confirm-no-enroll

Conversation

@ph
Copy link
Copy Markdown
Contributor

@ph ph commented Mar 4, 2019

Fix an issue with a partial enroll, when a user refused to overrides a
local configuration actually the enroll command did already used the
token on the ES cluster, this commit move the confirm in the CM instead
of having it in the Enroll's function and is executed by sending the
token or creating any files on disk.

Fixes: #10150

Comment thread x-pack/libbeat/management/enroll.go Outdated
@ph ph added the needs_backport PR is waiting to be backported to other branches. label Mar 5, 2019
ph added 2 commits March 5, 2019 13:58
Fix an issue with a partial enroll, when a user refused to overrides a
local configuration actually the enroll command did already used the
token on the ES cluster, this commit move the confirm in the CM instead
of having it in the Enroll's function and is executed by sending the
token or creating any files on disk.

Fixes: #10150
@ph
Copy link
Copy Markdown
Contributor Author

ph commented Mar 5, 2019

reviews changes are in and I've rebased.

@ph
Copy link
Copy Markdown
Contributor Author

ph commented Mar 6, 2019

jenkins test this please

Just to make sure that jenkins is fine with that.

@ph ph merged commit 5eb5085 into elastic:master Mar 11, 2019
@ph ph mentioned this pull request Mar 11, 2019
ph added a commit that referenced this pull request Mar 11, 2019
Missing changelog for #11067
@ph ph added v7.2.0 and removed needs_backport PR is waiting to be backported to other branches. labels Mar 11, 2019
@ph ph added the v7.0.0 label Mar 11, 2019
@ph ph added the v6.7.0 label Mar 11, 2019
ph added a commit that referenced this pull request Mar 13, 2019
…1186)

* Fix a issue when cancelling an enroll. (#11067)

Fix an issue with a partial enroll, when a user refused to overrides a
local configuration actually the enroll command did already used the
token on the ES cluster, this commit move the confirm in the CM instead
of having it in the Enroll's function and is executed by sending the
token or creating any files on disk.

Fixes: #10150
(cherry picked from commit 5eb5085)
ph added a commit that referenced this pull request Mar 14, 2019
…1185)

Cherry-pick of PR #11067 to 7.0 branch. Original message: 

Fix an issue with a partial enroll, when a user refused to overrides a
local configuration actually the enroll command did already used the
token on the ES cluster, this commit move the confirm in the CM instead
of having it in the Enroll's function and is executed by sending the
token or creating any files on disk.

Fixes: #10150
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants